Skip to content

Add np.intc to _factorizers in pd.merge #53175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 8 commits into from
May 17, 2023
Merged

Add np.intc to _factorizers in pd.merge #53175

merged 8 commits into from
May 17, 2023

Conversation

hoxbro
Copy link
Contributor

@hoxbro hoxbro commented May 11, 2023 •
edited
Loading

continuation of #52478

@mroeschke mroeschke added Reshaping Concat, Merge/Join, Stack/Unstack, Explode Windows Windows OS labels May 15, 2023
@juli4nb4dillo juli4nb4dillo mentioned this pull request May 15, 2023
Closed
5 tasks
@mroeschke mroeschke added this to the 2.0.2 milestone May 16, 2023
@mroeschke
Copy link
Member

One comment otherwise looks good

@mroeschke mroeschke merged commit 64e88e3 into pandas-dev:main May 17, 2023
@lumberbot-app
Copy link

lumberbot-app bot commented May 17, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 2.0.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 64e88e3d45a4cebe110a20634ae280297e4951a8
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #53175: Add `np.intc` to `_factorizers` in `pd.merge` '
  1. Push to a named branch:
git push YOURFORK 2.0.x:auto-backport-of-pr-53175-on-2.0.x
  1. Create a PR against branch 2.0.x, I would have named this PR:

"Backport PR #53175 on branch 2.0.x (Add np.intc to _factorizers in pd.merge )"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@mroeschke
Copy link
Member

Thanks @hoxbro

mroeschke pushed a commit to mroeschke/pandas that referenced this pull request May 17, 2023
@hoxbro @mroeschke
Backport PR pandas-dev#53175: Add np.intc to _factorizers in `pd.…
180536a 
…merge`
mroeschke added a commit that referenced this pull request May 17, 2023
@mroeschke @hoxbro
Backport PR #53175: Add np.intc to _factorizers in pd.merge (#5…
8983c5d 
…3276)

Co-authored-by: Simon Høxbro Hansen <[email protected]>
topper-123 pushed a commit to topper-123/pandas that referenced this pull request May 22, 2023
@hoxbro @topper-123
Add np.intc to _factorizers in pd.merge (pandas-dev#53175)
35f6ae8 
* Add np.intc to merge table

* Add whatsnew

* Updated unit test

* Fix lint

* Only add intc to _factorizers if not int32

* Mention that the problem is on Windows

* Update pandas/core/reshape/merge.py
Daquisu pushed a commit to Daquisu/pandas that referenced this pull request Jul 8, 2023
@hoxbro
Add np.intc to _factorizers in pd.merge (pandas-dev#53175)
64b550e 
* Add np.intc to merge table

* Add whatsnew

* Updated unit test

* Fix lint

* Only add intc to _factorizers if not int32

* Mention that the problem is on Windows

* Update pandas/core/reshape/merge.py
@simonjayhawkins simonjayhawkins mentioned this pull request May 15, 2024
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mroeschke mroeschke mroeschke approved these changes

Assignees
No one assigned
Labels
Reshaping Concat, Merge/Join, Stack/Unstack, Explode Windows Windows OS
Projects
None yet
Milestone
2.0.2
Development

Successfully merging this pull request may close these issues.

BUG: pd.merge fail with numpy.intc on Windows
2 participants
@hoxbro @mroeschke